Use diagnostic items instead of lang items for rfc2229 migrations #86726
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
roxelo
force-pushed
the
use-diagnostic-item-for-rfc2229-migration
branch
from
edfce75 to
c631594
Compare
|
☔ The latest upstream changes (presumably #86603) made this pull request unmergeable. Please resolve the merge conflicts. |
nikomatsakis
requested changes
Jun 29, 2021
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
Outdated
Show resolved
Hide resolved
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
Outdated
Show resolved
Hide resolved
roxelo
force-pushed
the
use-diagnostic-item-for-rfc2229-migration
branch
from
c631594 to
cc3af70
Compare
|
@bors r+ |
|
📌 Commit cc3af70 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit cc3af70 with merge 1c0863b88f5e2bc5e2dc3c11539e6144fdca7162... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
@bors delegate+ |
|
✌️ @roxelo can now approve this pull request |
|
@bors retry |
bors
added
S-waiting-on-bors
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Jul 8, 2021
…-rfc2229-migration, r=nikomatsakis Use diagnostic items instead of lang items for rfc2229 migrations This PR removes the `Send`, `UnwindSafe` and `RefUnwindSafe` lang items introduced in rust-lang#84730, and uses diagnostic items instead to check for `Send`, `UnwindSafe` and `RefUnwindSafe` traits for RFC2229 migrations. r? `@nikomatsakis`
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Jul 8, 2021
…-rfc2229-migration, r=nikomatsakis Use diagnostic items instead of lang items for rfc2229 migrations This PR removes the `Send`, `UnwindSafe` and `RefUnwindSafe` lang items introduced in rust-lang#84730, and uses diagnostic items instead to check for `Send`, `UnwindSafe` and `RefUnwindSafe` traits for RFC2229 migrations. r? ``@nikomatsakis``
This was referenced Jul 8, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 8, 2021
…laumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#84961 (Rework SESSION_GLOBALS API) - rust-lang#86726 (Use diagnostic items instead of lang items for rfc2229 migrations) - rust-lang#86789 (Update BTreeSet::drain_filter documentation) - rust-lang#86838 (Checking that function is const if marked with rustc_const_unstable) - rust-lang#86903 (Fix small headers display) - rust-lang#86913 (Document rustdoc with `--document-private-items`) - rust-lang#86957 (Update .mailmap file) - rust-lang#86971 (mailmap: Add alternative addresses for myself) Failed merges: - rust-lang#86869 (Account for capture kind in auto traits migration) r? `@ghost` `@rustbot` modify labels: rollup
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes the
Send,UnwindSafeandRefUnwindSafelang items introduced in #84730, and uses diagnostic items instead to check forSend,UnwindSafeandRefUnwindSafetraits for RFC2229 migrations.r? @nikomatsakis